bitkeeper revision 1.1414.1.1 (4288977dVBsJFO6uQ5e5ZXsFA0eSwg)

Merge 2.0-testing change:
Add time-label to /etc/xen.old directory name.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --cc Makefile
index a86b15c2deb2dc65d4e82b2e8c22f262613202dc,67824968851fb507de9e531976bcfa11fdd5fb18..b216033b97d9c24e70d81dd0ad84f6d976435cf3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -158,10 -157,9 +158,9 @@@ help
  uninstall: DESTDIR=
  uninstall: D=$(DESTDIR)
  uninstall:
-       [ ! -d $(D)/etc/xen.old ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
-       rm -rf $(D)/etc/xen
+       [ -d $(D)/etc/xen ] && mv -f $(D)/etc/xen $(D)/etc/xen.old-$(date +%s)
        rm -rf $(D)/etc/init.d/xend*
 -      rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
 +      rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
        rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
        rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
        rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*